From 50f45ea05a4dfefa970518cf58ace83e5d512367 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Tue, 12 Jun 2007 15:22:02 -0600 Subject: [PATCH] [IA64] Provide pxm_to_node and node_to_pxm translation functions Required for NUMA node table setup on sn2. Signed-off-by: Jes Sorensen --- xen/arch/ia64/linux-xen/sn/kernel/setup.c | 5 ----- xen/arch/ia64/xen/acpi.c | 22 ++++++++++++++++++++-- xen/include/asm-ia64/linux-xen/asm/numa.h | 2 ++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/xen/arch/ia64/linux-xen/sn/kernel/setup.c b/xen/arch/ia64/linux-xen/sn/kernel/setup.c index e1d48fa9fd..a62cf54de7 100644 --- a/xen/arch/ia64/linux-xen/sn/kernel/setup.c +++ b/xen/arch/ia64/linux-xen/sn/kernel/setup.c @@ -72,11 +72,6 @@ #include #ifdef XEN #include - -/* Xen has no clue about NUMA .... grrrr */ -#define pxm_to_node(foo) 0 -#define node_to_pxm(foo) 0 -#define numa_node_id() 0 #endif diff --git a/xen/arch/ia64/xen/acpi.c b/xen/arch/ia64/xen/acpi.c index 516a6741c0..61e01103fe 100644 --- a/xen/arch/ia64/xen/acpi.c +++ b/xen/arch/ia64/xen/acpi.c @@ -388,6 +388,24 @@ int __initdata pxm_to_nid_map[MAX_PXM_DOMAINS]; int __initdata nid_to_pxm_map[MAX_NUMNODES]; static struct acpi_table_slit __initdata *slit_table; +#define NID_INVAL -1 +#define PXM_INVAL -1 + +int __init pxm_to_node(int pxm) +{ + if (pxm < 0) + return NID_INVAL; + return pxm_to_nid_map[pxm]; +} + +int __init node_to_pxm(int node) +{ + if (node < 0) + return PXM_INVAL; + return nid_to_pxm_map[node]; +} + + /* * ACPI 2.0 SLIT (System Locality Information Table) * http://devresource.hp.com/devresource/Docs/TechPapers/IA64/slit.pdf @@ -473,8 +491,8 @@ acpi_numa_arch_fixup (void) /* calculate total number of nodes in system from PXM bitmap */ numnodes = 0; /* init total nodes in system */ - memset(pxm_to_nid_map, -1, sizeof(pxm_to_nid_map)); - memset(nid_to_pxm_map, -1, sizeof(nid_to_pxm_map)); + memset(pxm_to_nid_map, PXM_INVAL, sizeof(pxm_to_nid_map)); + memset(nid_to_pxm_map, NID_INVAL, sizeof(nid_to_pxm_map)); for (i = 0; i < MAX_PXM_DOMAINS; i++) { if (pxm_bit_test(i)) { pxm_to_nid_map[i] = numnodes; diff --git a/xen/include/asm-ia64/linux-xen/asm/numa.h b/xen/include/asm-ia64/linux-xen/asm/numa.h index 77b444c72c..640af474f8 100644 --- a/xen/include/asm-ia64/linux-xen/asm/numa.h +++ b/xen/include/asm-ia64/linux-xen/asm/numa.h @@ -75,6 +75,8 @@ extern int paddr_to_nid(unsigned long paddr); #ifdef XEN #define phys_to_nid(paddr) paddr_to_nid(paddr) +extern int pxm_to_node(int pxm); +extern int node_to_pxm(int node); #endif #endif /* _ASM_IA64_NUMA_H */ -- 2.30.2